Revision: bazaar--devel--1.3--patch-37
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Thu Apr  7 21:26:15 EST 2005
Standard-date: 2005-04-07 11:26:15 GMT
Modified-files: commands/branch.c commands/build-config.c
    libarch/configs.c libarch/pfs-signatures.c
    libarch/project-tree.c
    tests/test-archive-registration.sh tests/test-tag.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-1
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-2
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-3
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-4
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-5
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-20
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-21
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-22
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-23
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-24
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-37
    thelove@canonical.com/bazaar--devo--1.3--patch-43
    thelove@canonical.com/bazaar--devo--1.3--patch-44
    thelove@canonical.com/bazaar--devo--1.3--patch-45
    thelove@canonical.com/bazaar--devo--1.3--patch-46
    thelove@canonical.com/bazaar--devo--1.3--patch-47
    thelove@canonical.com/bazaar--devo--1.3--patch-48
    thelove@canonical.com/bazaar--devo--1.3--patch-49
    thelove@canonical.com/bazaar--devo--1.3--patch-50
    thelove@canonical.com/bazaar--devo--1.3--patch-51
    thelove@canonical.com/bazaar--devo--1.3--patch-52
    thelove@canonical.com/bazaar--devo--1.3--patch-53
    thelove@canonical.com/bazaar--devo--1.3--patch-54
Summary: merge from thelove
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--base-0
   tag of thelove@canonical.com/bazaar--devo--1.3--patch-46

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-1
   Fixed infinite loop in sig-checking code

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-2
   Merge (Canonical.com Patch Queue Manager)

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-3
   Fixed arch_project_tree_init to leave revision NULL if no patch logs

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-4
   Prevented one-arg branch from operating in conflicted tree

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-5
   Added test case for branch-with-conflicts

 * jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-20
   baz builcfg contents test

 * jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-21
   Merging from upstream

 * jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-22
   Put in magicp for build-config

 * jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-23
   merge

 * jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-24
   magicp fixup for configs, out of tree configs

 * thelove@canonical.com/bazaar--devo--1.3--patch-43
   bugfix for id on taglined files, overhaul internal inventory to be tree-relative, and bugfix replay patch-X

 * thelove@canonical.com/bazaar--devo--1.3--patch-44
   bugfix: segsigv in new signature check code - key is NULL when gpg is missing the key

 * thelove@canonical.com/bazaar--devo--1.3--patch-45
   bugfix: double-free in export

 * thelove@canonical.com/bazaar--devo--1.3--patch-46
   bugfix: baz segfaults on import with a unregistered archive (#284)

 * thelove@canonical.com/bazaar--devo--1.3--patch-47
   Fixed infinite loop in signature code

 * thelove@canonical.com/bazaar--devo--1.3--patch-48
   build-config contents test for url, old new

 * thelove@canonical.com/bazaar--devo--1.3--patch-49
   Put in magicp for build-config

 * thelove@canonical.com/bazaar--devo--1.3--patch-50
   fixes for tree with no tree-ver patchlogs, branch with conflicts

 * thelove@canonical.com/bazaar--devo--1.3--patch-51
   magicp fixup for configs, out of tree configs

 * thelove@canonical.com/bazaar--devo--1.3--patch-52
   bugfix: annotate would incorrectly assign lines to patches

 * thelove@canonical.com/bazaar--devo--1.3--patch-53
   support debian version numbers in the version namespace

 * thelove@canonical.com/bazaar--devo--1.3--patch-54
   if library-add fails to connect, exit with an error rather than segfaulting. fixes: 304

